<!DOCTYPE html>
<html lang="en">

<head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Document</title>
</head>

<body>
    这里是login里卖弄的文件
<<<<<<< HEAD
    <h1>我是在master里面改的</h1>
=======
    <P>我是在regb分支改的</P>
>>>>>>> regb
</body>

</html>